auto merge of #804 : alexcrichton/cargo/moar-fixes, r=alexcrichton
authorbors <bors@rust-lang.org>
Wed, 5 Nov 2014 23:43:18 +0000 (23:43 +0000)
committerbors <bors@rust-lang.org>
Wed, 5 Nov 2014 23:43:18 +0000 (23:43 +0000)
Some flaky test improvements as well as some updates to the styling of the docs.


Trivial merge